Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes part of #16: Implementation of AdminAuthActivity and AddProfileActivity #327

Merged
merged 125 commits into from
Dec 5, 2019
Merged

Fixes part of #16: Implementation of AdminAuthActivity and AddProfileActivity #327

merged 125 commits into from
Dec 5, 2019

Conversation

jamesxu0
Copy link
Contributor

@jamesxu0 jamesxu0 commented Nov 11, 2019 •
edited
Loading

Explanation

Fixes part of #16: Implementation of AdminAuthActivity and AddProfileActivity. It also implements a custom ProfileInputView to easily display error messages. Note the base branch is not develop but refers to PR #326.

Checklist

  • The PR title starts with "Fix #bugnum: ", followed by a short, clear summary of the changes. (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
  • The PR explanation includes the words "Fixes #bugnum: ..." (or "Fixes part of #bugnum" if the PR only partially fixes an issue).
  • The PR follows the style guide.
  • The PR does not contain any unnecessary auto-generated code from Android Studio.
  • The PR is made from a branch that's not called "develop".
  • The PR is made from a branch that is up-to-date with "develop".
  • The PR's branch is based on "develop" and not on any other branch.
  • The PR is assigned to an appropriate reviewer in both the Assignees and the Reviewers sections.

jamesxu0 added 30 commits October 23, 2019 10:34
@jamesxu0
implemented get and delete
0b1fb2a
@jamesxu0
Finished test cases
dac9b0a
@jamesxu0
added observing cachestore
a4b46e5
@jamesxu0
Fixed test cases
9c2f6a8
@jamesxu0
Merge branch 'implement-directory-util' into Implement-profile-manage…
53b5e78 
…ment-controller
@jamesxu0
Finished first draft of implementation
ab2c396
@jamesxu0
Added additional checks to setCurrentProfileId
b4f8e1f
@jamesxu0
Added more test cases
36e4ac9
@jamesxu0
Finished test stubs
0309848
@jamesxu0
Finished test cases
2be5883
@jamesxu0
Merge branch 'develop' into Implement-profile-management-controller
1b52ae3
@jamesxu0
Added query string to gravatar
509479b
@jamesxu0
primed cache on init
74c59a8
@jamesxu0
Fixed typo
bb28e07
@jamesxu0
Fixed addProfile test case
087cc0e
@jamesxu0
added create method to PersistentCacheStore
650bbbc
@jamesxu0
added setTimestamp and setAdmin
af182a3
@jamesxu0
Merge branch 'develop' into Implement-profile-management-controller
ad952ec
@jamesxu0
changed isAdmin to default to false
71710f1
@jamesxu0
Added update last logged in
e1b8331
@jamesxu0
Started working on chooser
593f564
@jamesxu0
debugging
48d600e
@jamesxu0
Added UI for chooser
6a9e197
@jamesxu0
added click functionality
b3a4641
@jamesxu0
Minor fixes
0c23eaa
@jamesxu0
Started basic admin auth and add profile
b5cabbc
@jamesxu0
Updated to use deferred value from persistentCacheStore
f5d854c
@jamesxu0
Merge branch 'Implement-profile-management-controller' into implement…
3bbd5b7 
…-profile-chooser-fragment
@jamesxu0
Updated to use login
756a759
@jamesxu0
Ensured result is error to post error value
bc477f0
BenHenning
BenHenning approved these changes Nov 27, 2019
View reviewed changes
Copy link
Member

@BenHenning BenHenning left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I skimmed through the Kotlin portions, but didn't look at the XML files in detail. Otherwise, I defer to @rt4914 for verifying the UI structural & correctness aspects of this PR.

Please let me know & reassign to me if you'd like me to look at anything specific.

app/src/main/java/org/oppia/app/profile/AddProfileActivity.kt Outdated Show resolved Hide resolved
app/src/main/java/org/oppia/app/profile/AddProfileActivityPresenter.kt Outdated Show resolved Hide resolved
app/src/main/java/org/oppia/app/profile/AddProfileActivityPresenter.kt Outdated Show resolved Hide resolved
app/src/main/java/org/oppia/app/profile/AddProfileActivityPresenter.kt Outdated Show resolved Hide resolved
app/src/main/java/org/oppia/app/profile/AddProfileViewModel.kt Show resolved Hide resolved
app/src/main/java/org/oppia/app/profile/AdminAuthActivityPresenter.kt Outdated Show resolved Hide resolved
app/src/main/java/org/oppia/app/profile/ProfileActivityPresenter.kt Outdated Show resolved Hide resolved
app/src/main/java/org/oppia/app/profile/ProfileInputView.kt Show resolved Hide resolved
app/src/sharedTest/java/org/oppia/app/profile/AddProfileActivityTest.kt Show resolved Hide resolved
app/src/sharedTest/java/org/oppia/app/profile/AdminAuthActivityTest.kt Show resolved Hide resolved
@BenHenning BenHenning removed their assignment Nov 27, 2019
@jamesxu0
Minor fixes.
7288409
@jamesxu0
Converted livedata to dataproviders
21420e4
@jamesxu0
Merge branch 'Implement-profile-management-controller' into implement…
aed08c8 
…-profile-chooser-fragment
@jamesxu0
Merge branch 'implement-profile-chooser-fragment' into implement-add-…
416b998 
…profile-fragment
@jamesxu0
Minor fixes
6535831
@jamesxu0
Merge branch 'Implement-profile-management-controller' into implement…
0b8991b 
…-profile-chooser-fragment
@jamesxu0
Removed coroutines from test.
d349940
@jamesxu0
Merge branch 'implement-profile-chooser-fragment' into implement-add-…
49d2f47 
…profile-fragment
@jamesxu0
Added helper methods
4ad7773
@jamesxu0
Removed ExperimentalCoroutinesApi
ac44e90
@jamesxu0
Merge branch 'Implement-profile-management-controller' into implement…
5603950 
…-profile-chooser-fragment
@jamesxu0
Removed import
fa2cf78
@jamesxu0
Removed ExperimentalCouroutinesApi
4d15d4b
@jamesxu0
Merge branch 'implement-profile-chooser-fragment' into implement-add-…
676c903 
…profile-fragment
@jamesxu0
Addressed comments
b26bd3b
@BenHenning BenHenning mentioned this pull request Nov 30, 2019
Closed
29 tasks
@jamesxu0 jamesxu0 mentioned this pull request Dec 3, 2019
Merged
8 tasks
@BenHenning BenHenning mentioned this pull request Dec 3, 2019
Closed
10 tasks
@jamesxu0 jamesxu0 changed the base branch from implement-profile-chooser-fragment to develop December 5, 2019 19:13
@jamesxu0 jamesxu0 merged commit 95dce9c into develop Dec 5, 2019
@BenHenning BenHenning deleted the implement-add-profile-fragment branch June 10, 2020 22:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@BenHenning BenHenning BenHenning approved these changes

@rt4914 rt4914 rt4914 approved these changes

Assignees

@jamesxu0 jamesxu0

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jamesxu0 @rt4914 @BenHenning